From 57e576dc3cc61826682f745203cbb817f7242d94 Mon Sep 17 00:00:00 2001 From: "emellor@ewan" Date: Fri, 7 Oct 2005 00:21:00 +0100 Subject: [PATCH] Fix conflicting merge. Signed-off-by: Ewan Mellor --- tools/python/xen/xend/XendCheckpoint.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/python/xen/xend/XendCheckpoint.py b/tools/python/xen/xend/XendCheckpoint.py index 6e6e60156f..9250f71b6c 100644 --- a/tools/python/xen/xend/XendCheckpoint.py +++ b/tools/python/xen/xend/XendCheckpoint.py @@ -142,7 +142,7 @@ def restore(xd, fd): log.debug("IntroduceDomain %d %d %d %s", dominfo.getDomid(), store_mfn, - dominfo.store_channel.port1, + dominfo.store_channel, dominfo.getDomainPath()) IntroduceDomain(dominfo.getDomid(), store_mfn, -- 2.30.2